From c9dae4c600b14a75224cb2743c8e2e3d9a60a705 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Fri, 9 Oct 2009 19:05:38 +0200 Subject: [PATCH] Remove deprecated code: GtkCheckMenuItem --- docs/reference/gtk/gtk-sections.txt | 2 -- docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml | 19 ------------------- gtk/gtk.symbols | 3 --- gtk/gtkcheckmenuitem.c | 11 ----------- gtk/gtkcheckmenuitem.h | 6 ------ tests/testgtk.c | 5 ----- 6 files changed, 46 deletions(-) diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index d1c366e8a6..8fd825ae5f 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -655,10 +655,8 @@ GtkCheckMenuItem gtk_check_menu_item_new gtk_check_menu_item_new_with_label gtk_check_menu_item_new_with_mnemonic -gtk_check_menu_item_set_state gtk_check_menu_item_get_active gtk_check_menu_item_set_active -gtk_check_menu_item_set_show_toggle gtk_check_menu_item_toggled gtk_check_menu_item_get_inconsistent gtk_check_menu_item_set_inconsistent diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml index 7ee3e06a04..8d83732199 100644 --- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml @@ -102,14 +102,6 @@ Creates a new #GtkCheckMenuItem with a label. @Returns: - - -Sets the active state of the menu item's check box. - - -@Deprecated: Use gtk_check_menu_item_set_active() instead. - - @@ -128,17 +120,6 @@ Sets the active state of the menu item's check box. @is_active: boolean value indicating whether the check box is active. - - -Controls whether the check box is shown at all times. -Normally the check box is shown only when it is active or while the -menu item is selected. - - -@menu_item: a #GtkCheckMenuItem. -@always: boolean value indicating whether to always show the check box. - - Emits the GtkCheckMenuItem::toggled signal. diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index ab3e3d46c1..5ec20e7d44 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -709,9 +709,6 @@ gtk_check_menu_item_new_with_mnemonic gtk_check_menu_item_set_active gtk_check_menu_item_set_draw_as_radio gtk_check_menu_item_set_inconsistent -#ifndef GTK_DISABLE_DEPRECATED -gtk_check_menu_item_set_show_toggle -#endif gtk_check_menu_item_toggled #endif #endif diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 8c77d618e4..754382f00e 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -282,17 +282,6 @@ gtk_check_menu_item_toggle_size_request (GtkMenuItem *menu_item, *requisition = indicator_size + toggle_spacing; } -void -gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item, - gboolean always) -{ - g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item)); - -#if 0 - menu_item->always_show_toggle = always != FALSE; -#endif -} - void gtk_check_menu_item_toggled (GtkCheckMenuItem *check_menu_item) { diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index b6f2e9adfe..2361c05d38 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/gtk/gtkcheckmenuitem.h @@ -91,12 +91,6 @@ void gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_i gboolean gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item); -#ifndef GTK_DISABLE_DEPRECATED -void gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item, - gboolean always); -#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active -#endif - G_END_DECLS #endif /* __GTK_CHECK_MENU_ITEM_H__ */ diff --git a/tests/testgtk.c b/tests/testgtk.c index a8d5144696..bfe57340b7 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -4155,11 +4155,6 @@ create_menu (GdkScreen *screen, gint depth, gint length, gboolean tearoff) menuitem = gtk_radio_menu_item_new_with_label (group, buf); group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem)); -#if 0 - if (depth % 2) - gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (menuitem), TRUE); -#endif - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); if (i == 3) -- 2.30.2